From 7c0eabfd40b1316645cdad488af9b76794eb57aa Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 14 Sep 2018 10:18:11 +0100 Subject: [PATCH] d/rules: Update Meson options, mostly removing enable- prefix --- debian/changelog | 1 + debian/rules | 25 ++++++++++++------------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3b25499054..ad776c28f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,6 +43,7 @@ gtk+4.0 (3.94.0-1) UNRELEASED; urgency=medium modules such as XIM and Wayland are now linked into GTK+ itself, while non-backend IM modules have been removed. * Remove obsolete debian/*.install files from GTK+ 3 + * d/rules: Update Meson options, mostly removing enable- prefix -- Jeremy Bicha Fri, 19 Jan 2018 22:05:35 -0500 diff --git a/debian/rules b/debian/rules index 51fc653ff3..953e9bd31f 100755 --- a/debian/rules +++ b/debian/rules @@ -89,29 +89,28 @@ debian/%: debian/%.in configure_flags_common = \ --libdir=/$(LIBDIR) \ - --libexecdir=/usr/libexec \ - -Denable-test-print-backend=yes + --libexecdir=/usr/libexec configure_flags_deb = \ - -Denable-broadway-backend=true \ - -Denable-x11-backend=true \ + -Dbroadway-backend=true \ + -Dx11-backend=true \ -Ddocumentation=true \ -Dman-pages=true \ -Dintrospection=true \ -Dinstall-tests=true \ - -Denable-cloudprint-print-backend=yes \ + -Dcloudprint=yes \ -Dmedia=none ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES))) -configure_flags_deb += -Denable-colord=yes +configure_flags_deb += -Dcolord=yes else -configure_flags_deb += -Denable-colord=no +configure_flags_deb += -Dcolord=no endif ifeq (linux,$(DEB_HOST_ARCH_OS)) -configure_flags_deb += -Denable-wayland-backend=true +configure_flags_deb += -Dwayland-backend=true else -configure_flags_deb += -Denable-wayland-backend=true +configure_flags_deb += -Dwayland-backend=true endif ifeq ($(filter %-doc,$(binaries)),) @@ -119,11 +118,11 @@ configure_flags_deb += -Ddocumentation=no -Dman-pages=no endif configure_flags_udeb = \ - -Denable-broadway-backend=false \ - -Denable-wayland-backend=false \ - -Denable-x11-backend=true \ + -Dbroadway-backend=false \ + -Dwayland-backend=false \ + -Dx11-backend=true \ -Dintrospection=true \ - -Denable-cloudprint-print-backend=no \ + -Dcloudprint=no \ -Dcolord=no \ -Dmedia=none -- 2.30.2